auto upstream

diff --cc lisp/emacs-lisp/cl-loaddefs.el
index 89e774f830ce289b364596074fa15e4469157afe,8ab2abec67e60a3bb5e38ae348f36dbf89bda386..40dea8ddebf46aa62499a47a67d026ef84f5f034
--- 1/lisp/emacs-lisp/cl-loaddefs.el
--- 2/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@ -267,7 -267,7 +267,7 @@@ including `cl-block' and `cl-eval-when'
  ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
  ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
  ;;;;;;  cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
- ;;;;;;  "cl-macs" "cl-macs.el" "7614365c56c74e8ed9d098d11801605b")
 -;;;;;;  "cl-macs" "cl-macs.el" "8a90c81a400a2846e7b4c3da07626d94")
++;;;;;;  "cl-macs" "cl-macs.el" "b36258e378f078d937e71b70b43fb532")
  ;;; Generated autoloads from cl-macs.el
  
  (autoload 'cl--compiler-macro-list* "cl-macs" "\

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/xdisp.c
Simple merge